From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 26 Jul 2019 06:30:19 +0000 (+0200)
Subject: Fix gpsbabel-gui package
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~97
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=0e6fa19c59e4f1d25c792cadc1040a354e116aef;p=gpsbabel.git

Fix gpsbabel-gui package

Closes: #932875
---

diff --git a/debian/gpsbabel-gui.install b/debian/gpsbabel-gui.install
index 640bf7c89..c093b335a 100644
--- a/debian/gpsbabel-gui.install
+++ b/debian/gpsbabel-gui.install
@@ -1,3 +1,3 @@
-gui/gpsbabelfe /usr/bin
+gui/objects/gpsbabelfe /usr/bin
 debian/gpsbabel.xpm /usr/share/pixmaps
 gui/gpsbabel.desktop /usr/share/applications
diff --git a/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch b/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
new file mode 100644
index 000000000..839945c9d
--- /dev/null
+++ b/debian/patches/0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
@@ -0,0 +1,42 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jul 2019 10:49:11 +0200
+Subject: Don't pass MAKEFLAGS to $(MAKE)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+make will pass them automatically. Also they are not meant to be
+consumed by make as they are stripped:
+
+Thus, if you do ‘make -ks’ then MAKEFLAGS gets the value ‘ks’.
+
+https://www.gnu.org/software/make/manual/html_node/Options_002fRecursion.html
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f6c341f..f376e46 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -382,17 +382,17 @@ rpm: changes.html
+ 	tools/mkrpm $(WEB) $(VERSD) $(RELEASE)
+ 
+ gui: gpsbabel$(EXEEXT)
+-	cd gui ; $(QMAKE) app.pro && $(MAKE) $(MAKEFLAGS)
++	cd gui ; $(QMAKE) app.pro && $(MAKE)
+ 
+ linux-gui: gui
+-	cd gui; $(MAKE) $(MAKEFLAGS) package
++	cd gui; $(MAKE) package
+ 
+ # Build the Qt front end, place GPSBabel in the right place, deploy all
+ # the libs.
+ 
+ mac-gui: gui
+ 	rm -f gui/GPSBabelFE.dmg
+-	cd gui; $(MAKE) $(MAKEFLAGS) package
++	cd gui; $(MAKE) package
+ 	mv gui/GPSBabelFE.dmg  gui/GPSBabel-$(VERSIOND).dmg
+ 
+ # release check using CVS tree
diff --git a/debian/patches/series b/debian/patches/series
index d8b0e0304..f3752ea72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ htmldoc-location
 0007-Use-system-shapelib.patch
 0008-Use-usb.h-from-system-include-dir.patch
 0011-Fix-exec-in-gpsbabel.desktop.patch
+0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
diff --git a/debian/rules b/debian/rules
index 3fdfb6cdc..f8cbfa5bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,10 @@ override_dh_installman:
 			./gpsbabel
 	dh_installman
 
+override_dh_auto_build:
+	dh_auto_build
+	if dpkg -s qtwebengine5-dev; then $(MAKE) gui; fi
+
 override_dh_auto_build-indep:
 	$(MAKE) doc
 	$(MAKE) gpsbabel.html